Cleanup of API demo