Some cleanup of examples