clean up unnecessary parts