Clean-up of old files and weird stuff before module refactor.