dabase class cleanup