Removed commented useless code