OPAL-1688: Removed some comments