cleaning up unnecessary