Remove CBS Local configs
Merge master