Code cleanup: Removed references to deprecated methods

Change-Id: I7d2509e69c468b3f049f644f7a0c50f6fc96968f
Signed-off-by: Gert Scholten <gscholt@gmail.com>
5 files changed