orig cleanup