big plugin clean-up