Features not present upstream: remove