cleanup not used code and commented out code