Removed test-only code