Remove Deprecation Warnings