Continue moving setup
Tidy up