Cleaned up /utilities/