Code clean up, bug still not going away, probably have to rely on retries to fix issue