removed UserLocation and OrangeApiRequest classes, modified scheduler code