Remove unused beta code