Made the tests pass as well.
Removed now unused code.