Local comment, to be handled in follow-up JIRA:
1. remove dead code