Merge "Removes vim headers 4th round"