add demo page, update cleanup to new namespace