More work on preloading m2
Remove dry-run