cleaning of unused code and comments