A few more removals/additions