Remove vim airline plugin and minor refactor