SPEED-17 Works on remove deprecated code