Removed code covered by inverse tests & notes to remove more.