Remove this big section of commented code?