Clean up some leftover junk