Cleaned up Deprecation Warnings