remove assumption on db name