Performed automatic cleanup and updates to CB 1.6.4 R2.1