Remove dead code
Better test