Clean up demo app for newer SDKs