Removed unused imports, added CDF option