Should this be removed instead?