update deprecated API to call the new API directly

The idea here is to call the new API directly in order to reduce the amount of code and to reduce the amount of maintenance (changes to the new API will automatically be "backported")

Disadvantage: Might break compatibility for the old API?