Better routing clean up. Now requires explicit message handling