** Removed deprecation warnings