Tidy up some left overs