Optimization and clean up of Siebel library.