re-added shortcut during deletion and re-matching stages. adding major optimizations along those lines as well