Removing some leftovers, and adding more a slite more comments.