1) unused method removed
2) some minor fixes for transaction attributes
3) minor fixes for generics