Cleanups, $ensure check