Commented out remaining DESY stuff