Minor cleanup to accomodate new cleanroom