cleanups for beta release