remove patches
add countable noun form