Add some convenience methods.

This is more to help with back porting code from 2.0
remove unused imports.