Finally fix clean-up-buffer