Cleanup for beta release