Remove dead code, start on tests.