[NEXUS-6490] Simplify