remove Util, cleanup index