Merge "Removes vim headers 5th round"