Disentangled dependencies between static constructors or "One" and "OneOrMore" classes
Cleanup