More refs removed