[PATCH 00/28] moveconfig: Drop old code and tidy up