Remove old plugins
Pull in latest changes