remove non-contrib plugins, minor edits

@hariadi please review. thanks!