deleted some old no-longer required bits.