Removed old db setup code. minor cleanup.