more post-deadline code cleanup :)