[Realtime] Code cleaning.
Merge pull request #1022 from akbargumbira/realtime_2.1

[Realtime] Code cleaning.