Remove unneeded import, rename clobber switches