This `TODO` should be removed