Remove redundant `that`