code cleanup and reduction in all cbi files