installer and app code cleanup