reordered drops, removed some foreign keys