Removed drawing block and datasource protocol
Clean up
Clean up
Added CCMark class