Make cleanup check happen async