Get rid of old implementation (5 tests failing)