Remove files that slipped in 2c31e8a merge