challenge removal issue: wip