remove usage of deprecated methods
class/interface usage clean up