Cleanup after changing API interfaces