Removed a few more refs.