Remove unnecessary code and comments