Please remove commented out code