Fix catalog inconsistencies/invalidities
Add dependencies
Delete redundant file
Further fix for bug 21263
Resolved Bug 21432 - Static Typing in cbcl-minus-023.