Cleaned some more references