ES-3119: Removes comments