Rolled subs2 into subs1 and more cleaning.

Much of this was due to fixing a bug in my orphan search script
which was missing some orphans.