deprecations properly done
ignore NAMESPACE
tidy, removed non-generics to deprecated