More reference cleaning.