Remove unecessary calls to deprecated method