TDD remove old FIXME