Cleaning up

Removed unnecessary code/comments, etc.