Api clean-up

Change-Id: Ib3f2b63a66ef07da6b707f55a54663d81c762c35