4.2: Remove test code