[NEXUS-5917] more plexus removal