Remove useless diagnostic puts
Little tweaks