code clean up. got rid of commented out code