more work removing 2d indexes
need better degree point move detection