cleaned up unnecessary stuff