Add control remove function, rename workspace