Changes to core plugin

Removed unnecessary code and included latest version of comb