Removed now unused callbacks.
Merge branch 'aae' into fifo