removed some bits of content in places.