Merge "Removes vim headers 3rd round"