before Undo and Redo fixes
added drag and drop remove software unit fixed some warning msg