unused m_database removed