clean up code; less corba dependency