remove non-contrib plugins, minor edits