Remove some debug output and comments