Removes the simple deprecation warnings (still a couple left but they will need more work)