remove all for restructure