QuickMod refactor

Remove