Remove Deprecated Usage in Contrib Modules