Remove files that slipped in in 2c31e8a merge