Move strip-unit to utilities function