Remove underscore dependency for live code