just remove some comments, dead stuff