Clean up unnecessary stuff and remove wild import