decoder.cc: cleanup