cleanup
integrate db back to main pkg
just for fun