remove dist-dependent code (now in own branch)