NEXUS-5511: Cleanup