Some cleanup in the CountdownController