some cleanup regarding ongoing URI support