Cleanup model-{inventory,topology} build