further cleanup for release