Diverse cleanups
tree8f8c092e72643235bd52571fdb8ee3b8c2e59119
drwxr-xr-x - contrib