Changed description and remove commented out code.