Cleanup code, check todo