Removed util2 relferecnes.
Merge branch 'aae' into fifo