Removal of test code