More code cleaning
More code cleaning
Merge remote-tracking branch 'upstream/stickyproxy'