final removal of test code (hopefully)