Removing more test code