Merge "Remove vim headers 2nd round"