Actually tidy up the right thing this time