Doc update and clean up of examples