Removed remaining references.