Remove old fn refs