More decoupled/verified cleanup

Fix failing JS tests
Remove unused messaging on the backend.

@AlasdairSwan feel free to merge this into your branch.  This will fix the failing JS tests and clean up some stuff on the backend.