Move to latest minimal
Finish tidy up