Useless code removed