Disabled some comments