removed spurious shortcuts