JDR: remove some random logic, see what happens