clean up - should have happended long ago