took out some commented out code