Removed unnecessary code and comments.