Remove the commented out code ?