clean up; simplified demo