Fix copy paste typo
Historical commit - to be removed
Remove duplicate constraints
Add service factory constraints and assertions