remove more features, make tests pass