Merge "Fixing the lockless fifo destory bug. Removing unused code from element. build."