Clean up master. use 2.0 files for now.