Merge branch 'realtime'
Removed unused elements from the realtime code.