cleanup, demo prep