Add clean_targets, remove wdir
Add pooled diginorm, fix clean