Remove unneeded using stmt
Add implementation of unity job factory
Namespace cleanup