Partial Cleanup of materials in detector description
includes !287 (merged) so should be merged after