Cleanup, remove redundant functions, add RTCP SR counter