Clean up filesystem generics