cleaning up unnecessary stuff