Removing DB stuff for now