Added support for attribute removal in _update_optionals