Cleanup and beta build 4.