Completely removes all usages of the global system instance within the services code by passing in the using system instance to the services.
Tidies up namespace declarations