More cleanup of show