Remove an extra file from a merge.

This file ended up here through some merge, and shouldn't have been
here. It's been removed.