Removed some files, some fixes.