more plugin cleanup