In undertaking such activities, design features and improvements which promote energy efficiency may be included. [However, activities under this paragraph may be directed to the removal of material and architectural barriers that restrict the mobility and accessibility of elderly or severely disabled persons to publicly owned and privately owned buildings, facilities, and improvements including t