Remove use of nub 'coz it is slow