More cleanup of junk