Fix evaluation
Remove unused type