cleanup and additional URI

Change-Id: Ifb4255019c65e652da60e4c5f1eb356622208fde