Merge branch 'jk/prune-optim'