Removed some commented out debug messages and cleaned others