delete unused private static variable.
use lombok for more things in routing request. fix callers.
Merge remote-tracking branch 'upstream/master'