Should we also remove this file from this PR? I guess it isn't hurting anything...