cleanup, and vim pkg