- Continued cleanup in demo