Two other functions to accept QofInstance, cleanup