DS some cleanup.