Some cleanup to demo