removed unused code and comments