remove deprecated methods
generics
relax triggers API