Remove more test stuff