COOPR-567: code clean up