KEEP-876: trying to remove the two lines