cleaned up api lib

Change-Id: I11081c38634ce21e7ca5db3eb62d6e3d116b1ebc