Removed promise based callback delay
Bug fixes