(wip) fix cloning remove