More cleaning done on the utilities classes.