removed unused file
removed unused method
fix b00b2d5, case issue.