Do a small cleanup