Removing some references in wrong places.