Slim util housekeeping

(cherry picked from commit 257def2bc361d28df1e32067931ca1ac7f3b0eb5)