removed blocks of commented out code