the current db, done away with 2 unnecessary tables