Cleaned up code

Took out lots of debug stuff