Remove rework-inherit