Reverted skip_cleanup