add cleanup for uri re-use