Trimmed dataset, removed old code.