Few comments removed