Clean up unnecessary