Clean up demo app code