Removed beta features for release