Remove instead of commenting out