HV-925 Removing comments