Removed old utils