204156f69d
This change cleans up some deprecated methods and an exception. Change-Id: I02ce0624d9b0963db7b00a5098e76a33552c1b12