Minor changes to remove test code