Removal of some test code