clean up unnecessary code