Cleaned up comments that the merge put back in