remove DbMap from lib
strip more unwanted code from the lib