[Demo] Cleanup