Remove references to demonstration server