More code cleaning

Removed a bunch of debugging stuff