removed some unused methods and classes, and move a test to the test project