WIP: [NEXUS-6027] Remove some more deprecated & useless