removed lots of commented out code and unnecessary comments