Remove duplicated functions and remove unnecessary code for stopping cmd