Actually clean up from the other changes.