cleanup with decoders; now we have plugins ;-)