Final clean-up, hookup into filtering, and ensure order of dependencies in Reactor