Commented out some potentially problem-causing code.