add move devices & clean up