style fix
Remove some unneeded code
fix the makefile
remove unneeded telemetry histograms
Remove pbSwitch.js from the Makefile
reorder the makefile