Cleaned up more of it.
Getting closer.
Just need to fix message propagation.
Then it should be done.