Cleanup. Update to BETA4.