now with more remove route fixes!