Cleanup of some other reference calls.