Cleanup update in application / on application start #707