Consolidate subroutines in subroutine daemons
Remove old id based cruft