Remove problem-causing code group