some cleanup.