Better management of users removal