Minor changes, removed files