Removed stupid promises which only made code more complex