remove unneeded `that` variable