- removed old methods
- fixed a failing test