Removed dependency on CMUtils