Remove extra DB fetch