Cleaning up the modus_operandi data flow.