lots of cleanup of the API