removed large sections of commented code