Fix shape not removing clone