More cleanup of old modals.