removed database dependency?