Commented out features for Beta, fixes #627