Remove unused API code

[lottspot]

Identify dead code paths and commented out code in the API source code and remove it from the code base