Move commenting of plugins
More progress on commenting/pruning plugins