commented out unused attributes, removed deprecated code