remove more test code