General cleanup of API modules

Change-Id: Ie936ed9c6f81f627e04f50f13bf3f1ca8bc71183
Merge "General cleanup of API modules"