Minor changes, and some removed files