Remove, add earlier, update case test.