Minor vim cleanip and removed of unused functions
Minor cleanup