FIX: Do not include yet Parametric optimizer (revert 759397d) + NEW: Faster deletion of accounting records