Clean up code test for branch compatibility on all platforms