Remove unnecessary code
Update kibit-mode