Reference cleanup and simplification