Cleaned unused files
Misc. changes