Remove some stuff that is not generic.