Fix deprecations

Created by: zlatanvasovic

This makes removation of deprecated things in v4 easier.

P.S. Idk why are these connection timeout errors happening. Looks like Travis-Ci hasn't finished maintenance.