Cleans up unnecessary code