Clean up sample app to match the latest generator version