Minor fixes
Cleanup all unnecessary file