got rid of commented out garbage