Cleaned up relaxed-uri branch