remove junk code - lot more remaining