Removed the CC-Tool hacks from the module