more cleanup in pre for release