Removed some features again