cleaned up unnecessary lines