CE-1125 Clean-up