remove cane from project
Merge branch 'remove-cane'