Замятин Евгений, 2539

commented code should be removed