cleanup
update router