Code tidyup, delete unit test I'm not going to implement