deleted lots of commented out code