More vim cleanup