Cleaning up unnecessary code