Remove Bob Michael's oodecoder stuff from this branch