Cleanup ApiQueryFlow

* Defined $container
* Removed namespace that isn't used
* Removed deprecated getVersion() and useless getHelpUrls()

Change-Id: I73c29663da6e083b307eeeea611b3efc249bc120
Merge "Cleanup ApiQueryFlow"