Refactor reset of app after import