Remove user command
Fix user remove action
Tests refactoring