FIX remove company-cider package
Refactoring