Remove assignRef calls