Removing a few changes that were not actually needed, and correcting comments.