Removed unnecessary promises