remove cmds; modify reference