*8123* Reference cleanup