Removed remaining deprecation warnings