Small cleanup for release