Clean up some puts and comments,  Ticket0496