Remove silly "that"