Useless code cleanup