Cleaned for main run.