clean up canberra code