cleanup for next release