Simplify return handling
Remove test debug output
Silence debug output by default