Tidy commented out code