remove superfluous conditional