removed need for db