done cleanup in Order and Invoice