removed more test code