Fix feature removal