unnecessary code cleaning