Move.PASS removal; reorganization of switch,case statements.