Tidy up last few steps