Remove instead of commenting