Simplify API checks
Merge pull request #2789 from bootstraponline/simple_api_check

Simplify API checks