Plugins clean-up