Tidy up previous commits