Start working on the test.
Remove uneeded code.