Useless commented code has been removed