Fix host class, remove instance variables