Correct url
Remove unneeded methods

Change-Id: I6e92b98235461a19956e2afbc2c7b59711f73453