removed deprecation warnings