More cleanup in the utils module
3 files changed