Cleanup and app update