Getting rid of some left-over test code.