Cleanup: remove test code