Fix up settings and remove old files.