Removed more refs