Removed some logic that wasn't needed following removal of some deprecated code.