Removed beta features
Flagged some broken features