Cleaning up

Removing comments and commenting unused code