Removing some deprecated types/warnings
5 files changed