removed unused methods
fixed all tests.