Clean demo build pre-Fortis