Some remaining troublesome comments removed
Merged with behnam