trimmed some unnecessary stuff from material in preparation for upgrade