more cleanups for release