Removed more unnecessary references.