WFLY-1904 Tidying up