Commented out debug stuff

Accidentally left in some altered functions for debugging, oops.