Are all of these removals due to a bad merge? This is otherwise new code.