More cleanup on example scripts