Cleanup code workaround for updateStatus() and false positives