Removed company-cider / added emms