Refactor & remvoe gitgutter