Extract command service

I think that this is unneeded code. @tailsu  what do you think?