Removing references to deprecated low level API