cleaned up some commented code and a debug line