Clean up unnecessary parts