interface consolidation, simplification, etc.

Change-Id: I2ddd668428e9b5f2642e02af24eed8b29b341593