Completed vim cleaning