cleanups in run cmds + removed unnecessary 'to in Server'