Remove URI Requirement