removed unused code
removed old test cases