Change appId and more cleanup