Heading fix & out-of-date stuff removal