Clean up

Cleaned up comments and deleted code that wasn't being used anymore