Cleaned up cane msgs