Removed cd nonsense