Yes, and deleting the unused utils functions