cleanup odim code. references #29