[REFACTORING] Remove a deprecated method