More reference cleanup