Refactored the module to remove the deprecated API methods