CAAERS-7062, cleanup.