SSP-1163 Cleanup after AbstractReferenceAdminWithoutDelete removal