Don't use generics

Not supported with -source 1.3
Remove shippable notifications