Clean up util subdirectory