cleaning up rehydrate and router