Remove ICommandSender Usage