Remove shorten for now