Cleanup and Larry adjustment for beta release