Fixed a few things.
Removed some backup and useless files.