Switch to using the raw data.
Remove factor from cleaned-up data.