Removing the useless code