WL-3242

Tidying up files