COOPR-503: code clean up