Remove more test code