Removed most of the old code from CDD1.