Change router dependency to our fork and do a little clean up