[minor] Just clean up references