Removed unused files, and some changes.