NEXUS-5472: Simplification