cleaning up unnecessary code