cleanup and rename app