SES-1726 : Cleanup writer