todo example cleanup