Remove extra DB read