Clean up some refs.