Fix typo
Use an API more ucl friendly
Drop support for legacy remote db