add URI
remove comments