Simplify dest API
Fix errors
Remove debug logging