Done clean cp-core, merged #20