More cleanup of scripts