Remove excess *files.
Bugfixes.