Final cleanup before attacking invoice creation