7.0 invoice customs cleanup