Get rid of manual derived files, tweak config files