remove database dependency