Remove and refactor away some CDO stuff