right before account-ui removal