Alexei Babich <a.babich@rez.ru> cleanup