Plugins cleanup, round 1.