cleaned up messyness

cleaned up some commented temperaray code.