This removes the optional call to the plugin.
This also includes tweaks here and there within the service and repos.