I'll remove those from this pull request and file a separate request which removes all of them in general.