Cleanup of material parser class