Cleanup in utils module.