Code clean up on demo app.