a little more cleaning - still a long way to go