Some minor changes. Removing unused files.