#22 Cleanup. I should not work so late!