Removed features that were not ready