Minor change:
- completed the remotion of the deprecated method