Merge "Remove vim headers"