test / fix unused code