Delete alternate optimizations, move sample data