NEXUS-7608: More cleanup