Merge "Remove unused filegroup"