Add final foreign keys, remove remaining indicies