Removed lines that made promises null internally