Cleanup of parts of the poll tutorial