Remove some debugging stuff in the generic demo that shouldn't have been checked in.