got rid of some commented out code