Tidy up notebooks, remove duplication