Removed unused exports.
Merge branch 'aae' into fifo