Merge "Remove unused code from BandwidthController"