Remove unused code and comments