Project: datamanagement
Issue DM-1145: Remove code made obsolete
Story points: 4