Removed genericity handling