Pushed version to 2.0, clean up API