Remove unused vars.  #29