Switch to Plug plugin manager and misc clean ups.