minor cleanup in demo app. core not done