Removed unused utils