more cleanup for release