lots of cleanup
Removed final debugging things for verification