some cleanup ...