Clean up

Removed a lot of comments and old legacy code