Removing obsolete data
Minor update of other/corner case titles