Removed ccore dependency