Cleaning out unused utility code