cleaning up contrib mgr (also fixes #1684)