Cleanup unused code and add more comments on ignored test case.