[EXT-132] code cleanup