Database class cleanup