remove some special shift cases that have been subsumed into the