fix clone x dup bug and cleanup