Further cleaning on demo