Remove promises, fixes loading issues.