Remove parts of this driver which use internal API calls. This replaces the calls as suggested by Russell King.