Remove useless files.
Misc changes