[Changed] group fs cleanup and bug fixes