Remove database dependency