remove promises & all other logic added