Cleaned code. Removed CDO related classes.