Removed more unused references.