removing TODO functionality. refactoring uri declarations