WL-3242

More tidying of files