Cleanups + handle restored event