remove some database stuff for now. need to branch this