Removed more promise code