BBX999

Thanks for clarifying that it is meant to be cleaned up, so there may be a bug here. One thing I note from the cleanup code is that it seems...