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