Add y2r:u stub
Cleanup debug messages.