Add support for removing features