Refactor: UserCommand/UserCommandType removed.