CON-329: Removed unnecessary code