Clean-up following plugin management change