QuickMod refactor

Yes, I agree about the ugliness. We can have them removed for now, but we'll need to either look at adding them back or doing something else, like threading.