Cleaning up useless code