CORE-4819: defined new properties and removed the code that relied on the old properties