More cleanup in the utils module