Various minor changes and removed files