Continued clean up, mostly removed use of depricated methods