Removed commented lines, some incorrect return statements and added a uri validator stub that always returns true.