CON-1807: Removed unnecessary code