Removes the simple deprecation warnings (still a couple left but they wi...

...ll need more work)