OC-5990
cleaning not needed statements