cleanups of expanded basis class.