removed innecesary http requests