NEXUS-7586: Fix conflicting versions and add cleanup