Removed deprecation warnings