removed lots of old commented out code