cleaned up unnecessary code