Adding updated utilities. Removing old unused utilities.