cleaning up original quickstart code