more db abstraction (support for mongodb :-) )
cleanup