More cleanup for Final