remove a ton of extra imports from plugin cleanup