Merge "moves addCleanup few lines upper to avoid potential leftovers"