Fix ovs plugin and cleanup service relationship