REP-0127: clean up references