Update notebooks and cleanups