Removed obsolete beta code