cleaned up some commented out code