Catch up on AMO table removals (bug 999119)