removed some callbackhell