Fix unique error
Remove unused vairables