WIP [Fixes #2424] App#reset

I think we may need to cleanup more things yet (event listeners etc.)