Clean up unnecessary stuff