DB/SAI: Fix some duplicate aura errors and clean up the SAI.