Clean bits not yet merged into master.