Code review fix: remove commented out code (OMS-133)