More cleanup for release