Removing useless code