Useless commented code removed