Cleanup the API.

Consolidated lists in a single class.