move urls update method to urls & cleanup