Clean up of modules Util classes